Press n or j to go to the next uncovered block, b, p or k for the previous block.
| 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 | <script lang="ts"> import { enhance } from '$app/forms'; import type { Enums, SetPrescription } from '@strengthsys/shared'; import Icon from '$lib/components/Icon.svelte'; import IconButton from '$lib/components/IconButton.svelte'; import type { SetLogView } from '../+page.server'; import SetLogRow from './SetLogRow.svelte'; // Single source of truth is the DB `workout_status` enum (via @strengthsys/shared); // values propagate through `gen:types`, so this never needs hand-editing on enum change. type WorkoutStatus = Enums<'workout_status'>; interface Props { sets: SetPrescription[]; status: WorkoutStatus; prescribedExerciseId: string; workoutLogId: string | null; /** Logged sets for this exercise, keyed by set_number — pre-fills the editable inputs * (in_progress) and displays actuals in the read-only completed view (#422). */ loggedSetMap: Map<number, SetLogView>; } let { sets, status, prescribedExerciseId, workoutLogId, loggedSetMap }: Props = $props(); const IIshowLogColumn = $derived(status === 'in_progress' && workoutLogId !== null); const IisCompleted = $derived(status === 'completed'); </script> {#if showLogColumn} <div class="sets-table__bulk"> <form method="POST" action="?/completeAllSets" use:enhance> <input type="hidden" name="prescribed_exercise_id" value={prescribedExerciseId} /> <IconButton type="submit" name="check-all" label="Complete all as prescribed" data-testid="workout-complete-all-prescribed" /> </form> </div> {/if} <table class="sets-table"> <thead> <tr> <th scope="col">Set</th> <th scope="col">Weight</th> <th scope="col">Reps</th> <th scope="col">RPE</th> <th scope="col">Rest</th> {#if showLogColumn} <th scope="col">Feeling</th> <th scope="col">Log</th> {/if} {#if isCompleted} <th scope="col">Actual weight</th> <th scope="col">Actual reps</th> <th scope="col">Feeling</th> {/if} </tr> </thead> <tbody> {#each sets as set, i (i)} {@const setNumber = i + 1} {@const logged = loggedSetMap.get(setNumber)} {@const isLogged = logged !== undefined} {#if isCompleted} <!-- Read-only completed branch: show prescribed vs actual, mark skipped (#422) --> <tr data-testid={logged?.skipped ? 'workout-completed-set-row-skipped' : 'workout-completed-set-row'} class={logged?.skipped ? 'sets-table__row--skipped' : ''} > <td>{setNumber}</td> <td>{set.target_weight_kg != null ? `${set.target_weight_kg} kg` : '—'}</td> <td>{set.target_reps}</td> <td>{set.target_rpe != null ? set.target_rpe : '—'}</td> <td>{set.rest_seconds} s</td> <td data-testid="workout-completed-actual-weight"> {#if logged?.skipped} <span class="sets-table__skipped-badge">Skipped</span> {:else if Ilogged?.actual_weight_kg != null} {logged.actual_weight_kg} kg {:else} — {/if} </td> <td data-testid="workout-completed-actual-reps"> {logged?.skipped ? '—' : (logged?.actual_reps != null ? logged.actual_reps : '—')} </td> <td data-testid="workout-completed-feeling"> {logged?.feeling ?? '—'} </td> </tr> {:else if showLogColumn} <SetLogRow {set} {setNumber} {logged} {prescribedExerciseId} /> {:else if IisLogged} <!-- Read-only logged set (non-completed status but has a log — defensive): show the actuals. --> <tr data-testid="workout-set-row-logged" data-logged="true" class="sets-table__row--done"> <td> <span class="sets-table__logged-check"><Icon name="check" size={14} /></span> {setNumber} </td> <td>{logged.actual_weight_kg != null ? `${logged.actual_weight_kg} kg` : '—'}</td> <td>{logged.actual_reps != null ? logged.actual_reps : '—'}</td> <td>{set.target_rpe != null ? set.target_rpe : '—'}</td> <td>{set.rest_seconds} s</td> </tr> {:else} <tr data-testid="workout-detail-set-row"> <td>{setNumber}</td> <td>{set.target_weight_kg != null ? `${set.target_weight_kg} kg` : '—'}</td> <td>{set.target_reps}</td> <td>{set.target_rpe != null ? set.target_rpe : '—'}</td> <td>{set.rest_seconds} s</td> </tr> {/if} {/each} </tbody> </table> <style> .sets-table { width: 100%; border-collapse: collapse; font-size: 14px; } .sets-table th, .sets-table td { padding: var(--space-2) var(--space-3); text-align: left; border-bottom: 1px solid var(--line); vertical-align: middle; } .sets-table th { font-weight: 600; color: var(--ink-soft); font-size: 12px; text-transform: uppercase; letter-spacing: 0.05em; } .sets-table tbody tr:last-child td { border-bottom: none; } /* Logged set in a read-only (completed) view — muted, like the old style. */ .sets-table__row--done { color: var(--ink-soft); } /* Skipped set in completed view — muted */ .sets-table__row--skipped { opacity: 0.5; color: var(--ink-soft); } .sets-table__skipped-badge { font-size: 12px; font-style: italic; color: var(--ink-soft); } .sets-table__logged-check { display: inline-flex; vertical-align: middle; color: var(--success); margin-right: var(--space-1); } /* ── "Complete all as prescribed" bulk action — icon-only; name in tooltip ── */ .sets-table__bulk { display: flex; justify-content: flex-end; margin-bottom: var(--space-2); } </style> |